Merge "Enable profiling via xhprof"

diff --combined includes/AutoLoader.php
index af86c99,ffd361c..8a9dd1f
--- 1/includes/AutoLoader.php
--- 2/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@@ -346,7 -346,7 +346,7 @@@ $wgAutoloadLocalClasses = array
        'LinkCache' => 'includes/cache/LinkCache.php',
        'LocalisationCache' => 'includes/cache/LocalisationCache.php',
        'LocalisationCacheBulkLoad' => 'includes/cache/LocalisationCache.php',
 -      'MapCacheLRU' => 'includes/cache/MapCacheLRU.php',
 +      'MapCacheLRU' => 'includes/libs/MapCacheLRU.php',
        'MessageCache' => 'includes/cache/MessageCache.php',
        'ObjectFileCache' => 'includes/cache/ObjectFileCache.php',
        'ResourceFileCache' => 'includes/cache/ResourceFileCache.php',
@@@ -419,6 -419,7 +419,6 @@@
        'DatabasePostgres' => 'includes/db/DatabasePostgres.php',
        'DatabaseSqlite' => 'includes/db/DatabaseSqlite.php',
        'DatabaseSqliteStandalone' => 'includes/db/DatabaseSqlite.php',
 -      'DatabaseType' => 'includes/db/Database.php',
        'DBAccessError' => 'includes/db/LBFactory.php',
        'DBConnectionError' => 'includes/db/DatabaseError.php',
        'DBConnRef' => 'includes/db/LoadBalancer.php',
@@@ -699,18 -700,9 +699,19 @@@
        'SwiftVirtualRESTService' => 'includes/libs/virtualrest/SwiftVirtualRESTService.php',
        'VirtualRESTService' => 'includes/libs/virtualrest/VirtualRESTService.php',
        'VirtualRESTServiceClient' => 'includes/libs/virtualrest/VirtualRESTServiceClient.php',
+       'Xhprof' => 'includes/libs/Xhprof.php',
        'XmlTypeCheck' => 'includes/libs/XmlTypeCheck.php',
  
 +      # includes/libs/cdb
 +      'CdbException' => 'includes/libs/cdb/CdbException.php',
 +      'CdbFunctions' => 'includes/libs/cdb/CdbFunctions.php',
 +      'CdbReader' => 'includes/libs/cdb/CdbReader.php',
 +      'CdbReaderDBA' => 'includes/libs/cdb/CdbReaderDBA.php',
 +      'CdbReaderPHP' => 'includes/libs/cdb/CdbReaderPHP.php',
 +      'CdbWriter' => 'includes/libs/cdb/CdbWriter.php',
 +      'CdbWriterDBA' => 'includes/libs/cdb/CdbWriterDBA.php',
 +      'CdbWriterPHP' => 'includes/libs/cdb/CdbWriterPHP.php',
 +
        # includes/libs/lessphp
        'lessc' => 'includes/libs/lessc.inc.php',
        'lessc_parser' => 'includes/libs/lessc.inc.php',
@@@ -885,6 -877,7 +886,7 @@@
        'ProfilerSimpleUDP' => 'includes/profiler/ProfilerSimpleUDP.php',
        'ProfilerStandard' => 'includes/profiler/ProfilerStandard.php',
        'ProfilerStub' => 'includes/profiler/ProfilerStub.php',
+       'ProfilerXhprof' => 'includes/profiler/ProfilerXhprof.php',
        'ProfileSection' => 'includes/profiler/ProfileSection.php',
        'TransactionProfiler' => 'includes/profiler/TransactionProfiler.php',
  
@@@ -1161,6 -1154,14 +1163,6 @@@
        'UploadStashNoSuchKeyException' => 'includes/upload/UploadStash.php',
  
        # includes/utils
 -      'CdbException' => 'includes/utils/Cdb.php',
 -      'CdbFunctions' => 'includes/utils/CdbPHP.php',
 -      'CdbReader' => 'includes/utils/Cdb.php',
 -      'CdbReaderDBA' => 'includes/utils/CdbDBA.php',
 -      'CdbReaderPHP' => 'includes/utils/CdbPHP.php',
 -      'CdbWriter' => 'includes/utils/Cdb.php',
 -      'CdbWriterDBA' => 'includes/utils/CdbDBA.php',
 -      'CdbWriterPHP' => 'includes/utils/CdbPHP.php',
        'DoubleReplacer' => 'includes/utils/StringUtils.php',
        'ExplodeIterator' => 'includes/utils/StringUtils.php',
        'HashtableReplacer' => 'includes/utils/StringUtils.php',